More code analysis cleanup. Moved to Linux for continued development.