metomi/rose#597: changes following review