Merge "Minor refactoring to support moving code to shell"