Convent (most) statics into consts