uniform if syntax

Now all 'if' use the same syntax.