Makes more sense to prepend new choices
Update haddocks
Support ghc 7.6