Okay, makes sense.
I'll try to change it the way you suggest,

BTW, I removed the patch to ordinal because in current libcore source it seems to be already applied, is that intentional?