Added non-nested comment handling.