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

Patch 18.

Change-Id: I92ea8da5143c527b91718563888258ec41e8fe09