Minor listener tidying.
More Server fiddling.

Make Raw optional, mark some fields as @Nonnull.
Merge pull request #218 from csmith/master

Server tidying.