I will probably have to do that, was hoping I had overlooked a nice way out.
It's really a shame type() was dropped, especially after compatibility was maintained from 5.x -> 6.0...