Cleanups for dfmc-optimization

another bootstrap showed that this survives a 3-stage-bootstrap from current master