Get rid of "insideList" and "expanded active property" in Expansion Algorithm

This addresses #218.