Fix struct matching for out of order members.