EOM was never used
rename files to better reflect purpose
do not automatically wrap expanded maps in a hstore array, let that handle the user