Clean up SimpleCommand, less casting.