Added CONST keywords where convenient.