preemptive changes for Kokkos+CUDA
I haven't compiled in that mode yet (don't know how), but these are some changes I suspect the compiler will require.