Make compiler choice more consistent