[Parser] Moving stuff to fix type-checking