ENH: Restructuring but no state transformers (yet).