Keep it like we have currently.

Make them all separated comment and let users sort from old to new.