Patches apply cleanly with today CURRENT