* commit 'b12b6b5116e3d76474296b45f570693bb10d6c99': Minor refactoring before starting on velocity tracker changes.