[cvs-nhc98] patch applied (york-compiler98): Mirroring the changes in my previous patch, plus a few de-literates