A bit more cleanup
Further cleaning up of the types. Could we get away without creating a transformer chain?