re-redoing off-by-one-token fix
making sure every statement ends in a semicolon, and making sure any
expressions in a block are wrapped as j-exprs, to ensure they're
treated as statements