More minor refactors in the milestone stats