Merge pull request #217 from csmith/master

Move mode alias reporting out of Server.
Minor listener tidying.