More cleanup
Shave off a few more lines from styles.c plus the changes I had in my branch for the drawing context rebased onto the current master
Shave off a few more lines from styles.c plus the changes I had in my branch for the drawing context rebased onto the current master