Some more minor cosmetic tweaks...