I like this patch better.  Retain the byte orientation of the parser.