metomi/rose#950: changes following review