Tidying from #38 a bit.