Move condition and 'then' to same line as (el)if

This is the style used elsewhere.