Switch to less magical payload passing