make callback args more consistent