Cleaned up the winddir code a bit.