And, like I said in 5255, I don't see how restricting the caps is necessary. What parser are you imagining would parse to the wrong format?
I don't understand what you mean by that. The caps isn't restricted anymore.
Well, it's restricted relative to 5255.
Anyway, I'm not sure any of this is an improvement over that patch set, but it's not really worse either, so approving.