Fix some whether/if inconsistencies
Merge branch 'whether' into pradet-fixes