Fix ghc-pkg-options arg.
More tidyup, nicer messages.