metomi/rose#581: changes following review