Bug 866823 - Don't create waivers in WaiveXrayAndWrap if the caller has no business waiving. r=gabor,mrbkap
Bug 866823 - Handle standard prototype remapping in PrepareForWrapping. r=gabor,mrbkap