Refactor the `if` helper to not rely on `bind` anymore

Baby steps...

@mmun 
Since it's just used internally in this file, I'm no longer exporting it.