More public/private tidying.