Merge fix for HTMLParser and improvements in declarations handling.