Looks good, although mixing up the sparse warning fixes and the d_path cleanup in one patch is a little odd. --