Incorporated fixes from Jeff's parser code review comments.