So this will wind up as writing PRs against swiften. Not saying that it's not the best solution here, I don't know the alternatives.