More work on converging skin/renderer