More small improvements to the Composer-friendly version of the PHP port.