Update to new benchmark-init API
Support code review through org-annotate-file