Make both calls completely equivalent.
Get rid of some warnings about unused variables.