Nice. Thanks@susnux -- I'm probably going to start making changes here too because the synchronous server implementation is deprecated. I'm thinking about un-deprecating it because it seems it's simpler to program than the asynchronous version, but it doesn't scale as well.

Do you want to give the conversion a try, to use the asynchronous server instead?

LGTM -- Anyway, I'm happy to merge this in first as it addresses a real issue.

Ok I will have a look.