Also, split a long line into two. And alphabetize the variables mentioned in the mark_as_advanced call.