Update per IRC peer review feedback

Restore the swap function's original name, remove convenience function,
use %u in log message, whitespace tweak.