Cleanup vis-a-vis r27691

Cleanup vis-a-vis r27691
Use x option on regex so we can break it up for legibility.
PHP doesn't seem to let you concat multiple strings in a constant definition, which is kind of lame, so this seems to be the cleanest way to break it over lines. :P