Fix advent test fail caused by grep optimization

MMD candidates for grep and friends where selected on Callable and Regex,
instead of the more correct Callable:D and Regex:D.  This caused grep
expecting to smartmatch on Callable type to fail.