Log Message:
Make this package build with recent C++.  With thanks to Bill Squier,
Krister Walfridsson and Soda for their help.

mmm, progress...