Some work on i386/x86_64 architecture parameterization.