r4241: More *alloc fixes.