Other code cleanup.