@dkubb actually, `operation` is not always defined, at least currently. Changing the code to what you suggested breaks a lot of specs. We could look at refactoring it at some point tho.