Fix/not inline

Some small fixes to squash deprecation warnings and allow us to run code without inlining callee kernels.

I'm not sure the current state of merging the firedrake branch into master, so this is targetted at firedrake for now.