Tweaked the exclude_struct for our improved matching code.