Fixed PP defines, added more code for handparser.