Unrelated to this change. Should be a separate commit (it's small enough I'd be happy to have it within this PR still though).