Certainly for reviewing purposes, this whole function is a bit messy in terms of control flow. I do believe that these changes are equivalent.

Originally posted by @DJMcNab in #46 (comment)