Respond to some review comments from Simon.