Add todo comment, fix expansion of _deditype