(#17) Some tidying up.