Slowly moving state into the same transformer types as other types.
- Tests to come.