Add 'const' to applicable variables.
And other small updates to reduce code size.

Change-Id: I92d7ef6888ded19bf178a8362c7ba9bb8b4c6d59