Stronger expression matching