Slight fix to 'after' cleanup handling.