We weren't re-entering template scopes in the right order, causing this to break self-host with -fdelayed-template-parsing. This reverts commit 237c2a23.