Bug 1033442 - Some minor cleanups to various allocations; r=jonco

--HG--
extra : rebase_source : 209452d3dc343eddb37aa1fc94b22ee83231def9
Bug 1033442 - Fix two innocuous live-at-exit strings in the shell; r=luke

--HG--
extra : rebase_source : 7dbdf0d43e97450d3045217c0787317257e0a288