Tweaking docs and removing TODOs.
Removing more TODOs.
Fix failed revert of php 5.3.3 test hack.