Patch for parser, shift-reduce error
Beautifying some code in type checker