A few years ago, Avril Lavigne mounted a disappointing comeback, putting out an album of middling adult-contempo balladry instead of embracing the pop-punk sound that made her a sonic touchstone for a whole crop of rising indie artists. But pop-punk has infiltrated the mainstream once again, and Lavigne has now returned to the sound that made her.