Add attempt to make code less crude
Broken commit. See http://bl.ocks.org/mbostock/1345853 when you wake up.