Fix some lingering internal uses of RiakClient.solr.