Fix byte compilation warnings

This eliminates the three implicitly-used variables, instead
naming them consistently and explicitly marking them as buffer-local.