Small change of plans. I have separated the SourceLayout related code shuffling and polish from the std::regex and GnuRegex swap. The SourceLayout parts have now been applied as trunk rev.14189. The remainder will have to wait until the GCC situation Alex pointed out is resolved. Amos