Minor cleaning in preparation for multiple velocities.