A bit of cleanup - move static fields into Facility.