Changes from review comments by Maynard and Max.