Make asMap() methods consistent.
94 files changed