Proposed land swap may smooth way for Ground Zero redevelopment