stop using positional pattern matches for ClauseHandler