[cvs-nhc98] patch applied (cpphs): Avoid name clash between L.P.C.Options.unlit and L.P.Unlit.unlit