Cleaned up condition code setting and clearing a little.