Big patch forthcoming.
Created attachment 14837 [details] patch
Comment on attachment 14837 [details] patch r=me
Landed in r22039.