Changes to better support parameterization.