Fewer compile warnings!