More fixes for bundler.
Handle no-args.