Good idea. Recent change in 5b2b59d sort of handles this and a couple of tests.