Upgraded coreparse, still pases tests.