Further work on CNF conversion