Completed transition to Nokogiri as main parser