Add "const". And clean up.

Change-Id: I70e6994a0cd1d897e6981d5642108fee1324708f
6 files changed