ENH: Less cruft