Touch-ups on MacOSX.  No functional changes