Minor HTML parse refactoring.