Fix CUDA issues
A couple changes introduced during the final review of !157 (merged) are fine with GCC, but nvcc complains and some issues slipped through the cracks.
- No redefining default template arguments
- Failure to recognize dead code due to
constexpr
branching
Edited by vinciguerra_a