Combine hstore array tests and drop indifferent access