Gave it a quick look, seems correct. Merge away!