Renamed type-eval to type-extract and build-type-cell to type-eval.