Transition to use hadfield package for subcommands.