Changes after comments from Luca Ricci and Jeff Oishi.