Minor code refactoring.

TNL-814