win32: rake code minor readablity improvements