add pic->feature
initial import of cond-expand from @KeenS's patch
diet cond-expand