The templating is very rudimentary. We should improve it quite a bit.
If this is not possible in a backwards compatible way, we don't need to wait for 4.x but could add a new package like template2 that tries to keep source compatibility, so it can be a drop in replacement for user code. And for places where we use it internally we could just use implicit conversions.