am be15d16b: Merge "Turn on -Wunused and fix the mistakes it uncovers."

* commit 'be15d16b7246e32a1e622d4442cf919646bc71a9':
  Turn on -Wunused and fix the mistakes it uncovers.