Rearrange vars
Improve notation
Add and use options for overriding GHC and Cabal magic hashes