A bit more minor cleaning-up.