Some bug fixes, especially wrt electric-indent.