Converting more routines towards simpler partition tracking.