am 932614ee: Minor code clean-up for GCC 4.9.

* commit '932614ee5e740704d7ef951dff6daede4fe12904':
  Minor code clean-up for GCC 4.9.