MNT: Fixes based on @tacaswell's comments.