Use `org-add-hook' in some places and merge Emacs revno r112320