Minor improvement of SNOPS.