Refactor module lookup, remove -f option.