Do magic "-foo" to "modname-foo" expansion only after other expansions fail

Otherwise users of dash might get undesirable results.