Was overzealous, fixes bugs caused by last structure change.