Fix issue #137 - reusing comment parsing logic from main parser