While fixing that, I broke out the huge multi-file patch-aa into separate patch files for each patched file in the distribution, and moved new files into ${FILESDIR} for easier maintenance.