JC-1375 A little refactoring.