Added handling to only define used rfc2119 terms

Addresses the issues presented in #345
It is apparently a convention so I am going to leave it alone for now.