Some PATH cleanups.