Fix use of and declaring of constants.