Split SpadExpression into several subtypes (phase 2).