Clean up conditionals.