Some more legacy cleanup.