Even more code cleanup.