More cleanup of handling commands over the bus.