More minor code cleanups.