Minor updates

* Don't match constant functions
* Simplify @ismatch expressions