peding: adapt use* functions to handle leftovers