Simplify some parsers in Protocol.