By default, give priority to most recently-drawn shape when breaking ties
Reorganise methods in file