Tweaks for #25: mapObject races with commit