ENH: More data munging