WINTERMUTE: Fix types in transform_struct for coherence; this silences warnings
WINTERMUTE: Comment out TODO bit