more (rev_)range_entries refactoring