More PHPdoc coverage for internals

See #1045