modified use of constants <constant> -> current.<constant>