You're right, this evolved from a previous pattern.
But I don't consider it worth changing now, this is going away soon anyway.