The fact that we're inconsistent about this in our functions is definitely going to lead to more bugs of this form down the road. (imported from commit 907badcb28c0834729e21436c621255fa6584d44)