Rename some variables in the process, and remove two cluttering asserts.
Attach a file by drag & drop or click to upload
