(Maint) Extract constant strings as constants