Thanks for keeping me on my toes, @rjmackay.
Done by 822cffc