Add sps-call-with-expansion and sps-with-expansion