Also, just for extra paranoia, only call safe_message once in the
decorator methods

Adds specs to make sure it still works