Cleanup2

In addition to the other commits (you already reviewed, so you can skip), this adds two more.  One that splits up ParseColorsTuple into three smaller function which remove the do-while(false) loops, and another commit which removes the commetted out libpng code.