Some minor code cleanups.