Re #8882. Get the spaces right.