Due to error "max-lisp-eval-depth" exceeded hiding comment subtreed
disabled.

Some renaming and refactoring.