Also update matching.rs.
Remove a fail!().
Reduce cloning in HTML serialization.