Doc changes suggested in @alexcrichton's review