Small code cleanliness bits

Conflicts:
	lib/Doctrine/ORM/Query/SqlWalker.php