Agreed. The move to San Fran in the book probably means they'll use Northstar again, but as a hero? Or as a guy who likes men, and happens to be a mutant.