I have a fair number of sweep things to fix up in v2, so I have put this with those other sweep stuff on my list.

- Michael