Fix the remaining E128 violations