Yes, you're right, that method could definitely use some simplification. It sort of grew organically, so now it's time for some pruning. I'm not sure if it's necessarily the cause of the errors on imacat's machine, but some refactoring will certainly aid in tracking down whatever is causing build fails in the next release.

Incidentally, thanks a lot for taking this so seriously, digging into the code, reading the docs - I really appreciate it.