Minor cleanup before refactoring our velocity approach.