PHP formatter: better handling of short if/else/elif/while/foreach statements