Bringing parser.rb into parity with pre-deprecation-warning versions.