MFH: r560282, r560704
Uses/cabal.mk: More correct fix for EXTRACT_ONLY problem from r559679. Uses/cabal.mk: Add "nodefault" argument.