Anyway: this now uses find, which is much less brittle.