built-in type scope refactor and other submodule updates