More HTML cleanup.