3.0 fix notnull

Fixes #3836
Didn't we decide that @var was not needed in constants?