Added items
Extracted cond-expand.cpp/h