Restore constant expression evaluation