- More cleanup of command protocol.