More tidying up after class path handling refactoring