I'm tempted to leave it like it is now to make it really obvious when it fails. We had an issue where our l10n IDs were out of sync and it took a couple months for anyone to figure it out.