A little cleanup, also don't force iocpreactor on Windows
Fix a bad rebase