Re: commctrl.h cleanup