Minor formatting and performance edits to the draw routines.