[COMMIT] Another batch of improvements for cl-indent.el