#525: reorder rules, remove duplicate rules