Improved handling of php folding.