Fixed more gendarme warnings.