Simplified proxy handling and minor tweaks to macros/aliases.

Signed-off-by: Sean V Kelley <seanvk@ortracks.org>