Improve rule-matching for let expressions