FIrst pass at applying patch; I only fixed up ONE of the rejected stuff files so far.