[MAT-180] Use int4 where appropriate