Montecarlo in general basis III: Shuffle the ordering of the cross terms
to reduce number of ifs (cleanup)