Be a bit more consistent about what's a set and what's a map