Removed now-redundant add-hooks; uncommented some still needed.
New approach seems to work with emacsclient
formatting