Lots more work getting everything to build with nvcc.