Remove the symlinks -- they will be used incorrectly on non-mingw builds.
Move result out of computation and into the mapping.