Simplify the CommandFactory.