Make toroplus less of a crapsack at rendering

Change-Id: Iededb4222c775a10cdfb72b29e7360e54031dd7b