Stand-alone comment parser fix