OK, I installed the patch, followed by the attached minor cleanups. Closing the 
bug report.