More work on the shell namespace extensions.