Renamed an argument to make it clear that we're doing more than just
redraw the shapes.
Moved layers control back to using names to identiy all the layers. This
means it doesn't hold on to obsolete layer objects when we hit new etc.