Follow-up r84475 CR; and also documentation fixes; PhpStorm 2.1 is *even more* fussy...