am 740def52: (-s ours) Eliminate dead code (helped by compiler warnings).

* commit '740def526e757f5ea8f30d9d28d1e7a668dadc42':
  Eliminate dead code (helped by compiler warnings).