[cvs-nhc98] patch applied (york-compiler98): More changes for Yhc to Core conversion