Last VWF touchups, removing the most obvious warts.