[PATCH] NTP shift_right cleanup