Address Ben's review comments.