More code sharing in draw/