Change/erasure

All phases including erasure now validate with -Ycheck. Review by @DarkDimius, others invited to participate as well.