Allow if conditions as the last statement of a block

[sunjay]

There is a slight ambiguity caused by if conditions being both statements and expressions: if you use an if condition as the last line in a block, it will be interpreted as a statement, even though it should actually be considered the final expression in the block. We should special case this and pull the if condition out of the statements list and into the final expression.