(Bug 4504) : Last-minute tidy-up