Fix for Cygwin...
Remove some indirection