Reverts some previous commits and modify the alignment strategy: now, we use alignment in Matx only when they have more than 4 elements.