There still seems to be a decent bit of common code between the windows and non windows cases here.