Continuing code cleanup.