Other code movements.
Keep refactoring things to subtracker2015.
Remove current_time (which duplicates i).