Slightly better handling of remembering data inspector being on/off