Hmm, did you see my subsequent commits and comments on this PR?  I found the last 10 errors and fixed them...