more minor cleanups.