PR: preserves comments in mapsloop