Correct parsing of directive args and comments.

This commit fixes previous issues in parsing directive args and comments
which caused parsing full conf files to fail. Full configuration files
can now be parsed without error. However the test will need ot updated
and proper testing/verification completed before certainty can be put on
the correctness of the structure created after parsing.