Multiple corrections, simplifications and additions to x86-templates.