Minor cleanups from port to oslo.messaging.