Code audit up through Graphics (see #88)