Completed _rebuild_master_index() to update.