Addressing a old legacy bug. Making sure the file validate also make it
easier to spot newly introduced errors and bugs.