Kill compiler warnings, part ii