Still easier to read than it was before 2.2, IMO.