Add cleaned-up NAMapKit.