Steps towards fixing #11983.

This isn't actually a fully-fledged pull request, but I'd like to make sure that this is the right direction for de-globbing?