Continuing adventures in refactoring series navigation