Again, hopefully if I've done this right, you wont notice anything at all. I've added includes to magic. This reduces the number of lines of code and makes it generally easier to debug. If you notice any problems with error handling, let me know!

*Update*
I've changed the magic scripts somewhat to restore compatibility with older versions of Gentoox! If magic ever looks to be misbehaving, just try running "magic update".