PHP-1024: fix type mismatches; don't fix get include names;