Follow-up fix after qa for bug#9464.
Tidied.