Source clean up; require AC 2.60 now.