Rich contracts V2 - Refactor spending calls

[rossneilson]

It's a bit messy right now, we should try to standardise adding additional calls to an action somehow.