JAL-2591 Further refactoring (still incomplete)