This implementation makes minimal changes: command names starting with "-" (other than "--") can still be queried normally.