PHP cart manifest fixup and other cleanup.

[merge]