[chore] Use primitive type shortcuts in match arms (#356)

[chore] Use primitive type shortcuts in match arms (#356) #1228