cl-grep: some refactoring around match-test functions