[#1626] Use static fields for default values