Cleanups: more consistent code.  No semantic changes.