Clean up some warnings with -Wall

Eliminate some warnings about shadowed variables, and an unused
import.