Add support for per-type originating elements.

Not needed for this PR anymore, but it's the correct value we want so I left it.