Cleanup around Mapper#Context due to cryptic Scala syntax ; fix map builder call