Further simplification of the border drawing code