switch to using '-' for trim_mode, and add comments to that affect