metomi/rose#816: changes following review.