ENH: generalizing ...