Fix OS X build.  Minor cleanup.