More uniform configs for i686 and x86_64.