Refactoring and cleaning Mac specific items.

* Removed all the commented out comments. Now that they're in git, we don't have
  to worry about saving them.
* Refactored some of the Mac-specific items into an if-then block at the bottom.