Convert if to return no longer created redundant conditonal
expressions.