Major changes to indenting in main loop to support mini-buffer.