Use Core_map in Semantics

Depends on #252