Small cleanup - relates to #318