Correct, it already assuming Mech Infantry is literally a half track with an infantry unit attached to get value of the unit. I’d just have a house rule that allows Mechs to pull AA guns and Artillery two spaces.