ENH:  Refinements.