Make changes as recommended by @jpolitz.