Refactor UserCommand/UserCommandType.