This is the only place these values are ever referenced outside of training code so this change is very justifiable and more consistent.