Properly save down the old component things in xmls.