A little cleanup before Logan's talk at the perforce conference