some more #602 related tidying things up