Fix collision with resolve.h.

resolve.h pollutes the global namespace with _res, so this clashes with our local parameter name.

Rename locals _* to *_ to address.

Fixes #2435 (closed)