Some more stuff to the po parser
Refs #3312 Dropping old code