Bug 1041291 v2

I think we potentially tradeoff from parsetime to runtime performance. I think we should measure to see if it's meaningful.