Removed unused nil stuff in parser & generator