Remove use of valueDeque
Break up the parsing a little more.