Removed debug output from resolver. Also made the early decision happen a bit earlier since it is a rare case.