Some more code cleanup.