Remove unexpanded lists when extending lists

Instead of overwriting the list value with cf_null, which is then
no longer stripped out during later processing, take unexpanded
entries out of the list.

Extend existing acceptance test.

Fixes redmine 6541