refactor / optimize review comment sink

- fix possible IllegalOperationException (Collections#emptyList)
- based on code by forrert