Have end-of-parsing type patching working