We're not using it systematically throughout the code base yet, so I'd rather not address that right now, but rather sweep through and change in a consolidated effort. It'd delay the addition of this code further right now, as I won't have a lot of time to re-write. Let's start tracking these cases in #1125.