more fixes for reflex -> root 6 migration in conditions

more fixes for reflex -> root 6 migration in conditions.
Please merge into the root6 branch.