clean up 'collapsed' constants

Change-Id: I8bb38ac918f061cd9ed4ad21d9ed686672dbde15
7 files changed