metomi/rose#753: update following feedback