Fixing property set ordering issues in SwitchCaseEvaluator