[mr2749] fix win compile after 2748. some cleanups.