Clean up wording/wiring of admin commands/listeners.