Fixing assorted issues with the parameter lookup process since migration.