Untangle program content container

refs #510