MULE-7485: Code refactoring.