Replace optional nl_or_comma with trailer