Cleanup the CommandType enum.
Fix regressions to previous changes.