Globals: Hashtbl.replace in place of Hashtbl.add