Need to also remove Constants from the valid_analyses set when invalidated, otherwise Constants is not reinitialized before used.
