[SVN r84252]
Tweak the id handling for using 1.5- compatibility mode inside 1.6 documents (you can't see this in the tests). [SVN r75610]