Change instances of 'armour' to 'armor', except where needed as an explicit alias.