standardize retry options and behavior

@asottile convinced me otherwise offline, but i'll pull this change out.