Incorportated parser review comments.