fix: some inconsistencies in Map grind annotations
20 files changed