A little cleanup and make watch3D hit test visible.