further cleanup png struct handling - refs #1783