Begin PP cleanup
Move the non-race case out of render
Small renames