[x] All commits are relevant to the purpose of the PR (e.g. no debug statements, unrelated refactoring, or arbitrary linting)
Small amounts of additional linting are usually okay, but if it makes it hard to concentrate on the relevant changes, ask for the unrelated changes to be reverted, and submitted as a separate PR.
Description
Quick tidy-up after https://github.com/silverstripe/silverstripe-admin/commit/bcd15c19d12f0c2723b73c4a4ee5318acb8f6000 (merging up https://github.com/silverstripe/silverstripe-admin/pull/1653 across majors)
Note that the code in the original merge-up does work just fine - it's just not quite as tidy as it ought to be.
Issues
Pull request checklist