FS-3227 --resolve this looks like sane changes.  My only complaint was the formatting.  Watch for whitespace indentation by looking at the code in emacs or vi where it should be tabed properly.