More BMessageFormat rework.

I'm stopping this now, I heard we want to leave those as GCI tasks.