use
This is what most of the rest of the codebase does, so this patch just tidies up a few additional places.