More fixes to defer.