More polish for #93.