Use OfCommandResult instead of matching by hand