Split up Grapher#catalogue