metomi/rose#716: changes following review