Refactor for random-access rules, about to drop.