Consolidate constants in Lib