Revert "Simplify subspace name search logic"

This reverts commit 2d89c4155f03c7066cf3794497f9424e2e0838dd.

The simplification leaves some gaps open that I'm not wholly comfortable with.