Make parser treat blocks as expressions

This is consistent with the AST, and will be necessary when
conditional expressions are introduced