Simplify by pulling SpadTypes and SpadFunctor into SpadNode.