Further fix my (radagast's) too ambituous XML changes (having broken props/units/tools links.).