Indentation and expansion now follows Emacs standards