Fixes for e10s ConvertPointPuppet from David Parks. Also add some comments to other code.