Minor tweaks: reduce distance to default, fix spec, improve assertion, improve comment, cosmetic.