Major perf boost by reworking how concrete type is derived