Bring code base into closer alignment with full featured version of Pic Puller