Added handling to only define used rfc2119 terms

Addresses the issues presented in #345
Yeah...  The idiom here is used throughout the code but I can correct it in this module.