wip: Only build the dynamic spans for speed