move comment logic into libvanubi