Added handling to only define used rfc2119 terms

Addresses the issues presented in #345