Apply suggestions from code review

Commit

45 days ago

Apply suggestions from code review Co-authored-by: Sigbjørn Skjæret <sigbjorn.skjaeret@scala.com>