Simplify the ClefPainter implementation.

This also provides a slight performance improvement over the previous
version.