MDL-37600 qtype match: fix codechecker issues.