Also use better argument names. The function is used in pbs recipe and
was wrongly removed in 569439d5 commit.

See !739