Preparatory fixes

Some more boring preparatory fixes before dropping the big PhpParser migration PR. @nb @joshbetz @nickdaugherty