Add-struct mechanism apparently complete, not tested.