Move more out of .profile.d.