Better generic handling of this.