improve comma-list-whitespace-expand code