Consolidate some constants

Mostly a style change to consolidate multiple const declarations.