Add const_matching flag to all the required functions