Add support for per-type originating elements.