Again, moving this into a function seems unrelated to this PR. :)