Running into the same problem as with dom/canvas: derived template classes not being happy about being non-unified. Kept unified for now to prevent linking errors.