Oops - my bad. I thought I had this in a separate branch. Must have inadvertently merged it.