Two minor cleanups

The latter requires the AnyMQ pull request I just sent, and thus wants an AnyMQ dependency bump.