Fix some issues with prior commit.

This fixes issues bringing up Emacs in Mavericks.