Remove extra increment inside block
Continued parser. Parse some defs now.