Split tikz stuff out, for easier arXiv submission