Allowing pre-resolving conditions to be set as current conditions are evaluated after resolving source/destination values; closes #446