Undo some "beautified" php code in a test template
More constant removals