Minor follow up to b73a578