Further refinements of x86 template.