More handling for option --trunk-only.