pulling out all traces to improve readability

If we allow for complex parameter at some point, this change would
have to be made anyway, because the C type of the trace has to be
chosen accoring the mathematical type of the trace expression.