Cleanup IS_VAR handling