Stripped map.h back out.