Fixed compilation. Disambiguated constant usages.