Drawing primitives coding style cleanup.