Change back strict Map to lazy Map, so the dependent API is nicer