Oops - I missed #156-159 in my original post. Embarassed

(should have been #156-162)