Cleanup with performance gain#40

NickSdot wants to merge 15 commits into

php:mainphp/docbook-cs:mainfrom

NickSdot:stack-09-performanceNickSdot/php__docbook-cs:stack-09-performanceCopy head branch name to clipboard