Some of my comments from #946 also apply here :)