I think we're screwing up in a lot more places than just this PR then.
There are 128 occurrences of this exact pattern in our current code base.
Here is a comprehensive list
https://gist.github.com/lukecampbell/11299360

I'm guessing the code conventions were published after these code modules were committed. 

I'll change the code shortly.