Merge pull request #216 from csmith/master

Improve some optionals.
Move mode alias reporting out of Server.

Doesn't really need to be there, makes more sense as a separate
observer which can do its own thing.