Thanks Steve, I've pushed this to master as
fc36ea0a0a40c618ee3488d8432ebb6d27b56fa3.

Chris