bdeformatutil: Improve comment handling
bdeformatutil: Fix failing test case