Update constant scalar expression support