Bug 993047 - Fix some style nits from f6b0e518f6d2.

--HG--
extra : rebase_source : 9cb1f3c793b066aed1836c08cce786554d61cfd2
Bug 983619 - Add Window.getInterface/QueryInterface to WebIDL, followup to deal with review comment. r=bz.

--HG--
extra : rebase_source : a0e0fa6d59c9edb9b346a5cb8b062144198a87c2
Bug 990158 - Remove line from bad merge in f1e4f0f82a9a.

--HG--
extra : rebase_source : ad5cddb57ed8acb125b9b9f164c4682b16bcd8f1