ChrisSmith

Hey @d-a-v I don't have time to resolve the conflict and test at the moment. You should be able to resolve + commit to this branch if you'd like. Otherwise...

`isValid` and `parse` don't seem affected, so its specific to `lazyParse`