@smn I guess this is a bad-ish habit of forward reading my issues and including set-up for upcoming issues. None of this won't be used but it does mean that strictly speaking this commit is not as tight as it could be.