Comment 1 for bug 1277731

There isn't a lot to go on in our codebase, but it looks like in at least a few similar cases we prefixed the variable with 'v_' to work around this sort of ambiguity. Unless somebody feels strongly that we should take this as an opportunity to establish some other naming convention, that works for me.