Inline one line if statements into && expressions

I like those now.