Adjust with latest language changes: elvis operator, orIfnull, optional line feed in comment