Fix pass-through parameter building assumption