Updated to address concerns raised on mailing list. I won't have time to work on this further for a while; please feel free to use / merge anything from the series that is acceptable. I'll try to make time again in a month or two to polish the rest of the patches up if needed.