minor tidy-ups to graphite integration