mark/expression: some cleanups in preparation for possibly exposing publicly#13790

bluetech merged 3 commits intopytest-dev:mainpytest-dev/pytest:mainfrom

bluetech:expression-lipstickbluetech/pytest:expression-lipstickCopy head branch name to clipboard