clean up parsing of constants
basic if expressions

`if` and `if-else` with single statements