Additional refactoring of code paths.
Additional refactoring of code paths. Part 2.