Simplify HStore conversions
Cleanup and simplification