Several Mac-specific goodies.
Minor: Swapped the two entries from my last commit.