Split guardReinferSuccess into checkReinferSuccess
Remove unused expression setters/contexts