Tweak RULEs; fixes #7041