Address @spicyj PR comments.