Fixing compile-time var embedding