v1.0.0-candidate.6 Minor tweaks.