Simplify commit_params a bit