Michael Snyder wrote:

> New diff attached.

Missed a couple of Joel's suggestions, new new diff attached.