Simplify the flux variables
The flux variables should be simpler by using `if`s of `constexpr`s instead of template specializations.
issue