Tidying up after refactor.