Clean up "check this if this else true" code.