Distinguish "Stage of the compiler we are using to build" vs "Stage we are building" in Hadrian

I keep getting confused and mixing up the two, and this lack of clarity has been a source of several bugs in Hadrian. It would be nice to distinguish the two notions of "Stage" in the types to avoid mixing them up.