Typo "&smp;" -> "&amp;"
Encode naked ampersands. ("&"->"&amp;")
Oops, missed a closing ; on an &amp;
Merge branch 'cleanup-corruption'