move name "type" member to end of definition to see if that makes the diff not freak out as much...