Move keyword-map to plumbing.map, add a test.