Remove "data-" prefix and minor touchups.