DiD: improved implementation of MODIFY_ONE_UNIT and fixed an issue with SUFs I accidentally introduced