Better and faster code according to CR-SCL-63.