Add Some and None shortcuts