Use getRedeclContext() instead of a manually written loop; fix a comment.
LGTM. I'll commit. Thanks Aleksei!