Rename __min to __sv_min; and other comments from GM