Fixed now, and rebased against master while I was at it.