Simplify test.
Fix constness.
Move some stuff around for creating things outside of the draw methods.