Further decoupling extensions from core spire.