Fix issue #334: More refactoring. Remove incorrect comment. Hopefully should work on mac...

....