Further fixes for handling of c-style comments