PR Fixup: Prefer integer code matching over string