ENH: More consistent use