Got rid of invocation helpers. We need something better.