Minor cleanups

Untangle and remove redundant parameters and parameters that always have the same value here and there. No functional changes. Unfortunately no major simplifications of the code enabled by this work either, but it's moving in the right direction.