Add svn is_temp vars, and clean up