Prevent an infinite loop; get entity matcher a tiny bit further towards compliance.
Prevent an infinite loop; get entity matcher a tiny bit further towards compliance.

svn path=/trunk/hubbub/; revision=4364

Achal-Aggarwal/hibbub,adamwight/wmf-parsoid-libhubbub,Achal-Aggarwal/hibbub,prepare/netsurf_libhubbub,servo/libhubbub,prepare/netsurf_libhubbub,Achal-Aggarwal/hibbub,servo/libhubbub,Achal-Aggarwal/hibbub,prepare/netsurf_libhubbub,adamwight/wmf-parsoid-libhubbub,prepare/netsurf_libhubbub,adamwight/wmf-parsoid-libhubbub,prepare/netsurf_libhubbub,servo/libhubbub,servo/libhubbub,adamwight/wmf-parsoid-libhubbub,servo/libhubbub,adamwight/wmf-parsoid-libhubbub,prepare/netsurf_libhubbub