Jurassic Core refactor now valid to current grammar state