ENH Rearrange definitions using ... erm __using__ to clean things up ... thanks to example from Inflex
removing uselses commit