Fix (& simplify & consolidate) param list creation