Changing state definitions in x86-template.xx