Changed protocol spec to RFC2119 syntax and extended it slightly.