Constant folding in computed enum members

merge artefact, this part was not changed