Purge a few more uses of d3.select, refs #595