Add ability to relax binary expression matching thanks to constraints on token type