Merge "Add more __restricts, clean up __format__ attributes."