Improve support for parameters.