A variety of tweaks to HStore from review.