Respond to Simon review comments.