I have a couple of fixes for warnings introduced after -rc1; catch up to -rc4 so that the fixes have something to fix.
