Fix grammar in default parser.
Simplify method.
Add additional null checks.