Interface fixes and other cleanups.

These issues arose as I'm integrating with Millstone.