perf: spread some mapMonoM where required
11 files changed