Gah, didn't read closely enough re: that last comment @jcoene, this looks fine. Thanks @boj