Use builder for types.
Attempt at cleaning up output a bit more.