Line numbers wrong in compiled [namespace upvar].
renumber tests for branch merge