Updated to latest CommandExecutorBase and now using CommandExecutorBase's ArgumentFilter to check argument lengths.