A few minor changes to placate static analysis.

--HG--
extra : rebase_source : ef8116836b0d9d8e9f6e919221968d8c0d5844a6
3 files changed