SPRNET-1387 - Minor refactorings/cleanups while analyzing the issue.