expand use of const variable declarations