The conditionals are currently difficult to follow. This simplifies them by splitting the fact setting up and doing a fact refresh after the first one is set. Change-Id: Ieba6845b4ef53012a872cb262f28cda9a36bed38