Fix null pointer in TokenReader.isEOF
Add support for return and block statements