Okay. I've updated the PR, and updated its title to reflect the fact that it's no longer concerned solely with anchors.