Tidied up Grid::draw(...)