Cleanup of some old if statements.