Scattered Refactorings

I'm doing these while I learn the codebase.
Here and elsewhere I'd prefer more terse variable naming (``field`` instead of ``f``, ``value`` instead of ``v`` ...)