git rid of deprecated zero(Typ) && one(Typ) warnings, strip trailing ws