[noticket] Minor tidying.