metomi/rose#503: tidying