Enter subclasses & fix for 6658

Makes CaptureActor a subclass of Enter and fixes #6658.