expand2 - proposal for (a little) simpler completion handling