More magic number cleanup to the parser.