> | Reformatted to avoid long lines (no other changes) > > That looks good to me. This one's in too. Only 1,265 untagged calls to warning() to go!