Replace old style "defined?" checks with new style @var checks.
Merge pull request #1 from joejulian/undef-fix

Replace old style "defined?" checks with new style @var checks.