Replace some integers with fixed-width variants