Apply review comments. See #7.