More cleanup to support partial command names.