Adds elisp output format and more command line options.