WL-172 Minor Refactoring.