Tweaks to indent-dwim
Move lisp sp bindings into correct form.