Bump version requirements and remove hack

xmlhtml 2.1 has my patch fixing a bug, so we can delete this workaround.