Refactor down to a single update_indices method