Remove hardcoded parameters, minor improvements for parameters-as-functions

Remove hardcoded parameters, minor improvements for parameters-as-functions #4456