More minor cleanups.