Reenable BuiltinSum/SpecialSum and move them foward

Reenable the BuiltinSum/SpecialSum fields and move them in front of
the timer list.