Removing Command.scala, using plain pattern matching.