KaiGai, Tom, all,
Attached is an updated patch which fixes Markus' dependency issue,
handles the other issues mentioned by KaiGai and Tom, has some
additional regressions tests to make sure all of that works, and has
been cleaned up to the 80-col goal (where it seemed to work well and
make sense..).
Please let me know if you have comments. Also, as is always the
case, testing by others is appreciated.
Thanks,
Stephen