It should not be necessary to have them so intertwined.
Created attachment 24132 [details] patch
Comment on attachment 24132 [details] patch r=me
Landed in r37370.