Address @gregcaporaso's comments