OK, I think I've managed to grok it. Plz, review this cleanup set. Especially the patch #5 -- I believe it's valid to use the issubpath helper here. Thanks, Pavel