First attempt was too greedy for matching blocks. This is now not so greedy (matches next */) and has a test.