Teach vectorisation about singletonP