Some minor code cleanup.