Changes to support implementing the shell.