Indentation: fix bug when IfStatement test contains a BlockStatement
Indentation: fix more weird onevar constructs and associated indentation rules.