local-ize a couple of variable refs