Better handling for fn-with-params.