Fix expressions not being required in some cases