So I realized another refactoring opportunity: DruidNodeDruidQueryExecutor was passing the response handler a JSON decoded response. While this is correct for our purposes, it kind of hardcodes some things.  I changed it so that responseHandlers now take a Guzzle Response object.