Added generic filtering/disambiguation higher-order tasks.