Added handling to only define used rfc2119 terms

Addresses the issues presented in #345
Nit: Do we really need a counter? Don't we just want to know if it's true or false?