Use RFC 2119 keywords more consistently.