Maint/one more fixup for already initialized constant warning