Decouple them by storing them in the XML separately rather than
regenerating them. This will simplify upcoming fixes.