fixed if statements ambiguity
probably fixed ambiguities in cases and switches
Merge branch 'trial-singlestatement-conditionals'