Add expression-match.
Make a little slower.
Remove debug cruft.