Huffman trims school voucher extension bill