Address @ryabouza's comments.