Add guard to ensure variables are wrapped when declared