Added handling to only define used rfc2119 terms

Addresses the issues presented in #345
Ok, maybe add a note in the code that it's currently unused? In case someone else reads the code later and wonders why it's a counter.