Rename shadowing variables, and align some things in Magic.hs