Hm. Hang on. I want to see the actual stack trace. I made these changes carefully and used the changed code for week myself, building many packages with it. I want to see what happened.