Further work on Drawing infrastructure.