[chore] Use primitive type shortcuts in match arms

[chore] Use primitive type shortcuts in match arms #1214