remove second template arg from shifts and aligns