Monitor enumeration cleanup.
Added return by setters of previous callback.