Thanks.  Pushed, along with corresponding unit test.