metomi/rose#680: changes following review