Fix `on_comments`?