AVALANCHE: Finish replacing C-style comments by C++-style