Well done. Much cleaner than my approach, and no doubt stiffer.