Cosmetic changes + minor test tweak.