BUG-2159: make sure generated comments are Java-8-safe