Yes I think there are some speedups to be had using Magic for this code, but it's dealing with an awful lot of special cases, so hard to say exactly what the best change would be. I'll leave comments on the issue since it's sort of offtopic for this thread.