Disabling shadowing (until bugs are addressed) and refactoring some constants.

Change-Id: Iaf4c98bcb13441be3e66048687ea5b0673d2bce6
11 files changed