Some cleanup to use Emacs 24.2 from source