Fixed support for comments-within-comments