Minor cleanups
Bugfix: Correctly roundtrip PHP with spaces after array

This is necessary after we added support for blank spaces after array
declaration in 05000373.

Fixes #3231.
--------------WORKING:   ADD IDML roundtrip tests
COMMENTS

REMOVE WHEN IT WORKS