REDTEST-0020: Code refactoring.