Fallout from changing Header to the typeclass pattern