Remove broken expansion, fix new way with_items are reported