Avoid casting away constness using C-style cast.
Either use const consistently or explicitly remove
const with const_cast.

Patch 19.

Change-Id: I89433cd022edb125061d07e7470224d2c21e549f