rebase and nit fixes
rebase and nit fixes

humphd/thimble.mozilla.org,humphd/thimble.mozilla.org,humphd/thimble.mozilla.org,mozilla/thimble.mozilla.org,mozilla/thimble.mozilla.org,mozilla/thimble.mozilla.org,humphd/thimble.mozilla.org,mozilla/thimble.mozilla.org