performance back to the fastest, conditional expressions being rewritten correctly and combined rezolvers seem to work correctly.