Address @twirl's comments in #7.