@fnothaft, OK done, and rebased :)