Changes from wavss_a_dcl code review, clean up nan result set compare and parser.

Change-Id: I44ba9430890bd4c3110bb6576da095559782da4d