Replace old defined? variable check with new @var check