Even better comment handling