Small refactoring

[tony-xia]

No description provided.

[cleemullins]

@tony-xia

This is interesting. Could you:

1. File an issue that describes the bug you're fixing.
2. In the fix, we need a test (or 2) that fails before the fix and passes after.

[cleemullins]

While your code is indeed cleaner, I don't want to take it quite yet.

Once we get into 4.5, in the next week, we can re-evaluate.

As this is a fairly straightfoward refactor, it seems simple enough...

[tony-xia]

Thanks @cleemullins . I am not sure whether I can find one test (or 2) that fails before the fix and passes after, because it's a code refactoring which keeps the same input, output and logic.

[cleemullins]

I pushed this code to a branch and ran our CI system against it. That's found here:
#2023

Based on that, I'm merging this in.