Some more improvements to exercise rule-restricted merge files