ag2: Minor cleanup