More "CONST" support