Some more fixes, and hack around odd PHP parser bug with concat operators