Both Toffoli and controlled-NOT need little help to do universal quantum computing